Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 9 Apr 2010 12:36:12 +0000 (12:36 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 9 Apr 2010 12:36:12 +0000 (12:36 +0000)

Trivial merge